From: Linus Torvalds Date: Wed, 28 May 2014 18:15:57 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~6562 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=282695802957b069d293a9f8773a14399093bd6f;p=linux-4.9.git Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs Pull vfs fix from Al Viro: "Oh, well... Still nothing useful on that livelock (I had something that looked kinda-sorta like a non-invasive solution, but it deadlocks), so it's just Miklos' vmsplice fix for now" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: vfs: fix vmplice_to_user() --- 282695802957b069d293a9f8773a14399093bd6f